More improvements to Behat run speed. Scenario/Route changes