Fixing Integration Tests