Revert "Fix another test"

This reverts commit fbef20d73fb5754a8c06c46c1612d00860c37b1e.
Revert "Fix tests"

This reverts commit 0f60d0518dd1920206efafb7217a34beab2a898e.
Properly fix the tests now

It is a common ConvertOptionParser option, so should be tested in the
base TestConvertCommand class.
Fix indentation
Add a comment and simplify a bit
Break too long line
Fix typo and simplify a bit