Config unit test tweaks