Remove class instance of @db, clean tests