Merge "Remove CoreTests: HeapTest"