Fix descriptor tests