FIx bugs in Integration Test
Fixing bugs