command_line branch from ping-pong

As received, all features green, 4 specs red

My main change: test previously forced to pass restored and actually passing, commit 6476904

Fix for run_with_timeout is in another branch so this stays minimal, submitting in separate pull req