Trying to fix failing tests for Domain Config.