Update tests to evaluate configurator