LPS-48189 Indexer not available in verify
LPS-48189 Fix tests
LPS-48189 Regenerate
LPS-48189 this was committed as part of Regenerate, but must have been accidental. So I'm reverting it