many tests fixed