Refactor forms with Fields partial & update Rspec tests