further test updates and Domain fix