Revert "Small fix for thread index"

This reverts commit 5b7f633e1c19d4e9e3f34f41f6701d8a36f4a84f.
Fix tests