Minor configurator and test updates