Add Descriptors tests (WIP)