Added test steps to match all user stories