Removed OptionHandler, added generified version of SimpleOptionsHandler
Wrote unit test for new generic SimpleOptionsHandler