update indicator test tool
don't shadow builtin word 'id'
factor out common var