More work on test config.