Cleaning after diagnostic-test shuffling