Handling special case in tests until there is a better solution to manage types, hopefully in 3.1.
Fixing issues with index snapshots and preconditions and comparisions found by automated tests