Rewrote test for new index behaviour
More broken code added...

The code currently fails. Something in the save process is not working.
Will figure that out tomorrow.