replaced ->new calls to Domain with ->instance calls where possible to make tests more realistic