MODE-2297 Additional fix for 'jcr:mixinTypes' index, plus more tests