Update implementation of indexed and write tests.