Cleaner test-memory cleanups
4 files changed