esm: mordernize old tests
Doing a round of fast cleanup of old open and stalled PRs.
Making sure this PR is moving along addressing the comments in the original discussion.
I added the author of the original PR in the commit message.
Co-Authored-By: Jacob Smith