Slight mods to correct failed tests linked to config settings.