modified usecases and JUnit tests
Merge https://github.com/CMPUT-301F14T10/project
modified use cases and JUnit tests, should be final change to them