more consistency in --help output
fix expected results