Merge "orchestration api tests, docstring cleanups"