Updated forms
update tests for all forms