add tests for form changes and fix issues with form changes, related to issue #5