Fix unit tests
Fix integration test