Removed unnecessary comments
2. Changed heap file creation location in test.cc
Changed binary heap file creation directory
Merged conflicts