Update tests, refactor databaseDriver require