FIX: DatabaseController tests fixed