Reworked form and associated tests.