I don't think we want to add more test suites to the kitchen test. These mappings can be unit-tested.