quickly fixes tests so that they will run
Merge pull request #20 from bohnje/quick_fix_tests

quickly fixes tests so that they will run