Merge pull request #504 from mhaskel/fix_tests