Unit Test Cleanup

This is a standing pull request for issue #1. It does not need to be merged to master yet. The advantage of having a pull request "live" during the issue fix is that Travis will verify build integrity as things get pushed to GitHub.