Fix unit test breakages