REPL scratch stuff moved into sensible tests for index catch-up code