Fixing other cloud ui bench test code that managed to merge into this branch.