Add a oneof test.
Add the "comboof" option.