fix some tests to not use change_descriptors for the heck of it