instrumental and locative data in place, tests pass