Integration Test Fixes