fixup tests
rollback previous tParam logic and simplify tParamRef helper