Merge branch 'ab/cmd-foo-should-return'

Code clean-up. * ab/cmd-foo-should-return: builtins + test helpers: use return instead of exit() in cmd_*