Update test catalog.  Deactivate more tests and two sample types.