Merge "unskip test_integration_1"