added all tests for user stories https://www.pivotaltracker.com/s/projects/1025368/stories/66549998 and https://www.pivotaltracker.com/s/projects/1025368/stories/66549954