updated tests
Merge pull request #1 from alexanderlarson/new_tests1

updated tests