Replaced more form state arrays with propre objects in tests.