Fixed chaining test indices.
Merge branch 'chaining_fix'