- fix short option detection
- refactor unit tests variable name, add tests