Update the mapping test

This more accurately reflects the actual mappings that are used in the
code, and thus does a better job testing everything.

Plus, the inheritance stuff just seems like extra setup for little or no
gain, so I will be looking at dropping some or all of that.