Make tests more DRY