Also consolidated the translation code to obtain all info with just 1 command execution. Also split test command mocks out to their own file for cleanliness.
Patrick Hemmer