tests: more swabbing on remaining rpcs.