Fixes for the config unit tests