added tests, removed mapped-index