Added indexes
Test fixing