Enumeration::lookup() and test & more changes