Update tests to be compatible with new mapping changes.