Fix Windows runtime error due to long-option formatting.
The use of spaces between long and short options and using long option names is known to cause problems with Windows compilations when using debug flags.
This MR shortens the option names, removes the spaces and tidies up the help message in the code. Test changes are limited to the change of option names.