I'll spend a bit more time on this tonight to see if the rollback is really a problem in the test or if we have a real issue with the domain management operations.

We can then decide whether to merge this PR.