Added tests, and fix for hadoop mapper timeouts