Modified enumeration management and test