Fix merge error in tests.