Made some changes to confs to get ready for tests.