fixup! Untangle and cleanup extract mr mapper and its tests Fixes #184, Fixes #108, Fixes #107