database.yml and test fix