LPS-46451 Fix TableMapperTest
LPS-46451 SF
LPS-46537 Account for additional custom properties