put tests in passable state, simpler id lookup