Improve testing configuration, update page names to be clearer.  Improve sorting configuration.