Fix TESTs