simplify test_adapter
Merge pull request #16920 from seuros/aj

simplify test_adapter