added more indices; added correct mapping tests.