Updating to behat2 and moving it out of the service-layer