Test suite: start adjusting for the way additional settings are handled in the new Greeter (refs: #12055).