Merge pull request #518 from mhaskel/test_fix