Updated solution for Domain.Tests addition