fix many tests