* PR feedback, and add related tests. * PR feedback. --------- Co-authored-by: Erik Montnemery <erik@montnemery.com>