Removing tests that are no longer needed