Merge pull request #339 from mhaskel/test_overhaul