Merge #11552: Improve wallet-accounts test