Merge "Improve test key names to reproduce public issue"