Make tests shorter and DRY