fixing last commit's test failures
Merge pull request #586 from dmdevito/testfailures

fixing last commit's test failures