Cleanup behat
More datasource naming fixes