Yes, those aren't the primary pick for those categories, just alternates.
In regards to testing, yes, all Intel chips are currently undergoing re-tests (it is killing me, honestly) using Intel's new guidance. This is, of course, going to be reflected in upcoming Zen 5 reviews.