Update the test cleanup to be FILO