Fix a nasty bug in the new indexable test
Fix a nasty bug in the new indexable test

Also add support for an environment variable to turn index on/off.


community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server