Fix merge keys in database.yml
Add test data for Events