Refactored behat feature set