Heap fixed and tested