Renamed tests to databaseConnection
Moved things around, starting with unit tests