Secondary index fixes
More tests for secondary indexes