Refactored test domain to remove unused interfaces