Testcases for user story 9 #41 implmented. Some minor changes also.
Merge with last commit