Merge "SF: fix memory leak in unit tests"