Fixed test breakage following test-settings enhancements