Improve domain tests