fixed broken tests
indices added