[FIX] Fixes after tests