[PATCH aeolus-cli 2/2] Change and refactor tests for refactored option parser use