Refactor for Qualified, New Toilet entity/dto tests