Made classes final
Added test for options parser
Fixed issue with picking up default options
Added test