Minor fixes in the FormModel test cases.