RANGER-2653: Refactor product code to move out APIs used only by test code
8 files changed