Merge "Adjust Settings tests to account for MODES_API" into main