Refactor Field
Fix test