Merge "Clean up the rollback when test is done"