Feature/fs1474 add insertionindex check

This branch include extended tests, which should be merged to the master. Before merging, we should review the branch.