Better testconfig handling