Update to further fix unit tests for the configuration changes