Fix unit test breaks