Added/Updated unit tests
Merge branch 'master' of https://github.com/zackhall/CapstoneProject