Make remote API unit tests easier to read and write Upstream-commit: 7c37cae17d675aa72a2146e881aaa7e30f8d291e Component: engine