JBehaveStory refactoring