Make mapping_create_multiple feature pass again

And also hits_all as a side-effect.