Moving from phpunit test environment to a specific behat test environment
Also more code comments and general cleanup