pulled in conf. tests passing