Fix option ordering. Test deeply clustered options.