Setting up integration tests
Fixing integration tests