SWC-805 Clean/update tests that use new access to simple parsers