removing static index - added tests to the todo