[PATCH 4/5] treewide: Rename test private keys to include format