Add more tests
Use the right mapreduce class
Drop LPW stupidity in front of headers