merge bheap tests