Add tests for index lookups too?