Fix unit tests. #54