Adjust test to Map refactorings