Fix many tests