The change to enum wrapping is just to fix an indentation bug I ran into while reading the generated code for some of these test methods.