support for new config, simplify tests