Adds test cases
Merge branch 'master' of github.com:pdewey/cs3240-improved