Added domain object tests and fixed diamond type warnings