Fix unit test breakage