Improve Domain-type tests