Fixed Domain model tests to work with Uow

Also pulled id into the supertype