Update OptParser with all updated Decorators and unittest