Revert "pushed fixes for test failures"
Merge pull request #5 from kengoldfarb/revert-4-master

Revert "pushed fixes for test failures"