Merge "Fix cleanup after tests"