moved helper static methods to Option class. some other refactoring. new test.