SWC-804 Code refactoring/test updates around new widget parser