Added more tests exercising 'for index' statement
Fix for 'for index' statement