XD-538 - Develop infrastructure to enable testability of commands