wrote more tests, noticed some design changes I may wish to write up
Merge pull request #20 from Apollo117/more_test_cleanup

wrote more tests, noticed some design changes I may wish to write up