Merge "Added cleanup in some tests"