Heap: improve ways of access, and tests