merging in new test from initial branch
Merge pull request #3 from jpsowers/master

Cleaning unit test class