Made the database work with the TestServer, created EOF at all files