Make the mapping index feature pass again

Also update two fixture steps which are also used in other features.
Make mapping filter feature pass again

Also update a fixture step which is used in several other features.