remove flexible equals logic; move in MapBundle

map bundle is a test-centric utility implementation that used to
live in hydra. I modified it a bit here and there to meet the
requirements that the equals methods were otherwise handling.