Fixing test field and textarea field after unit testing.
Merge branch 'refactor-formfield' into Unit-testing