Added patch for options and completed tests