Simplified unit tests
Merge pull request #18 from csampson/cleanup

Simplified unit tests