Avoid starting session whenever possible
Fix specs
Fix failing Behat scenarios