fixed unnamed-struct
fixed for enum var
changed tests