[FIX] Tests Fixing