Fix Configurator tests