Simplify MaxHeap implementation and test Comparator