Add test cases for desugaring (This exposes some more fay module, so it should perhaps be revised)