refactor specs to include user stories