test: fixup TestExpr string-matches
test: fixup TestExpr string-matches (bis)
test: fixup TestStmt string-matches