More test DRYing