Sprint refactoring (a test doesn't pass, see TODO in storyService)