Better testing for database queries, added some new controllers