Fix tests from #948
Merge pull request #963 from mhaskel/test_fix_948

Fix tests from #948