Merge "Code coverage for SO adapters"