Add tests for the new options, Fix my bugs in the original code.