Modified User Stories to better match our final tests