fix merge error in tests