Clean up some behat scenarios