Fix unit test for recent merge