Moved option-parser to tests-always-included
Updating to use reloacted option-parser library