Integration test fixes - Smoke