Make tests shorter