Merge pull request #5673 from maciejbocianski/mem_trace_tests

mem_trace tests refactoring

Author: theotherjimmy