more test config fixes