Remove unnecessary patch and update test comments