tests and isheap added