= fixed the rest of tests