Refactored and tidied map tests (with a tweaks to filter tests)