New tests format + clean test