* commit '21813c197f044e7a569bd430d38e710d110c9a8f': Clean up test allocations so real memory leaks are more visible