#987 Form: Update and create new tests.