more tests
Merge pull request #137 from mmunn1/testing

more tests