Issue #164 - adding some assertions
Issue #164 - adding some conditions in the tests
Issue #164 - finalizing the tests
Issue #164 - finalizing the userStory