Test Fixes - SOMyAccount - macros