Move herman's old tests and add return to cli.js (soon to be converted into cli_controller.js)