Working on alternative domain model and tests
Added some new tests for candidate domain replacement