Fixes & tests
New index start work