Fix unit tests
Fix integration tests