Minor changes on tests.
Mino refactor on form field assignation.