Fixed broken tests. Cleaning up some more options code.