GPII - Global Public Inclusive Infrastructure

Investigate and fix test case failure for SpiSettingsHandler