Fix unit tests (2)