refactor field form with partial and fix test