Fixed affected tests