Fixed failing test.
Merge branch 'story-1-fix'