HeapFileWithBuf/ contains old HeapFile code with buf.C implementation. All tests but #6 pass.