Merge pull request #18 from SerenitySoftwareLLC/develop

Building out some unit test stuff
Merge pull request #19 from SerenitySoftwareLLC/develop

Unit tests and fixes