added some tests
more test stuff
Merge pull request #2 from ECHartill/fix_tests

Fix tests