Updates for DynamicEnum tests