PMO-2679 Must also back out test