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