more test coverage
Merge pull request #129 from danmcginnis/testtesttest

A few more tests that simulate heavier usage of the system