Started converting content model mapping over to use AutoMapper to fix the composite tabs/properties. New unit tests for the mapping as well.
Finished content and media model mapping using AutoMapper and now the tabs display composite properties correctly.