refactored some behat features