tests cleaned up
Merge pull request #8 from kms617/clean_up_tests

tests cleaned up