fix testfailures that occur when domain is changed