Minor domain testsuite cleanup stuff