Minor updates, add TestConfigComplex