Worked on the unit tests some more
Merge branch 'master' of https://github.com/jaegerpicker/CantonSoftwareMentorship