Fix unit tests
Fix unit tests