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