Better memory cleanup in tests
Buildserver auto merge