Test Fixes - Kaleodesigner - macros
Test Fixes - Kaleodesigner - tests