Update CLI tests because factories update

Update keys for the values returned by the factories. This because
factories are only returning values returned by the hammer info command.

All touched tests are either passing or failing due to a hammer bug.
Better logging