don't use ridiculous and unprincipled method for finding what test we are considering; that value is constant
make it clearer how we're getting the indicator id
make it clearer how we're getting the indicator id
show how to work around hack
rm unused dict member