get rid of extraneous change_descriptor from some more tests