Fix failing unit tests. Need to move config into $_ENV soon