Make tests work with new config stuff