Merge pull request #7456 from valeriosetti/issue7446-backport

Backport: Clean up & improve PK write test functions