Fixes CLI tests for hammer template command.

Fixed the existing tests but had to flag them to be skipped due to
Redmine issue 4560.