Added tests and cleaned up code
Merge branch 'master' of https://github.com/ellenkoenig/fof-mapreduce