Test Fixes - CPDynamicdatalists - macros
LPS-48724 SF
LPS-48365 Add a missing column
LPS-48365 Source formatting