Made some methods private again for simpler tests around command line runner.