SPRINT: Update to develop and correct failing ctests caused by previous merges

[mikecooke77]

Description

Update test files to go with the associated ufo pr. This will get the ufo branch back in step with develop.

Issue(s) addressed

None

Acceptance Criteria (Definition of Done)

ufo ctests passing

Dependencies

To be merged with the following PR:

• [ ] https://github.com/JCSDA-internal/ufo/pull/2562

Impact

None