implementing option tests marked @todo
implementing option tests marked @todo
implement tests marked todo, implements #986