Test-and-Adapt: An Approach for Improving Service Interchangeability