erfg-map test refactored