remove field type enum
Fix testing