Fix up testcases where the domain is no longer needed in the search