Refactor one test to use sensible test domain objects