Merge "test: Add desugar support to run-test"