fix more tests
Merge pull request #57 from judajake/fix_tests

fix more tests