fix index-dependent tests