Some refactoring of the abstract map and related tests