Renamed the test class for the database. Updated the todo and made
server class a singleton.