Changed naming style for form fields.
Added skeletons for additional form fields and their tests.