refactoring bdd features