Updated test to new top-level enums.