Fully working @Domain handling and tests