Fix unit test errors