commited final changes and tagged for Behat 2 support