Syncing these two files up - everything is formatting changes

Eventually, we'll get it all coming out of the utility director
Added a much overdue help message to the test driver