Fix comments
Add a test method for index selector