Rename get_vfd_handle to get_descriptor, fix issues and add two tests