Untrack database.yml
Fix tests