Tweak and test for struct heaps