More test config cleanup