updated tests to reflect richer domain object