story-2-fix: Fixed failing test.
Merge remote-tracking branch 'origin/story-2-fix'