refactored new Heap file on affected test cases