Tweak tests to use test config files