tests fixed, cs