Use descriptor on remaining tests