Fixing integration test
Fixing build