Merge "Adapt doctor test case to the FeatureBase framework"