[PATCH 0/2] Refinements to memory usage tests