Merge "SF: Update unit test to pass non-default mocks." into main