Update Makefile to work for running correct Hadoop version.
Fix and enable file combiner tests.