Break out the tests into a file per command and clean up some long lines

Approved by:	will