Updated recorded command files so that they are more straightforward
Merge pull request #1188 from Benglin/RecordedTestFixes

These changes are trivial and there's no need for code review, I'm merging them in.