more config test fixes