Added tests for use cases of user story 8