Refactoring, added additional test class
Merge branch 'develop' of github.com:gminaker/cs410 into develop