Further rework the RPC-PAC test.