Fix memory leaks when creating test hierarchy