added some test cases
Merge branch 'master' of github.com:TeamW/Deliverable-6
fixed a few things