Merge "Fix RemoteClient usage in scenario tests"