Fix indexer implementations (builder)
Improve tests