Merge "Add integration test for capport API"