Fix tests to refer to correct fields.