Add package name prefix to error.
Clean up the formatting of test data.
Simplify test key.
Code style fix.