Chris/Chuan - added partial JUnit tests for uses cases 3 and 6.
Finished 2 and 5.