Adding Crossmatch Test to list of forms to configure
Other fixes related to crossmatch tests