Test Fixes - CPDynamicdatalists - macros