final fix for integration test