DRYing up with improved fixture handling