Fix for broken integration test