Checkpoint fixes

Next up: Maybe a factory for Mocca that I can pass to TestRunner. Or a
strategy object for Mocca that I can pass to TestRunner. Somehow I need
to pull the Mocca-specific crap out of TestRunner. Maybe them
communicate via strings. The Mocca factory would spit out a list of
command lines (each one a list of commands) that TestRunner would
consume and execute.