Update schema and testcase to make the key structure more transparent to
the author.