Merge "Adjust domain tests for changed list_domains scoping behavior"