Minor test config cleanup.