some fixes for some failing tests
fixed index tests