behat + phpspec + minor fixes