Merge "Update the test removal procedure"