Update test cases to support required fields.
Handle nil models / attributes.