Adjustment to testJSON
Merge remote-tracking branch 'origin/master'
Added support for remote index key override
Adjusted tests and json