Changing tests
Merge pull request #22 from johnb30/tests

Changing tests