Adding test points for memory leaks