More unerstandable descriptions
Updated test - options that do not expect values but have some

- Found by @jreidinger
- This should produce a different error message
Reworked checking for invalid options
Adapted old tests for new error message