[FIX] failing tests