union enum extract; some test fixes