Fix AST nodes to code issues (MAGN-836, MAGN-839)
Merge pull request #127 from ke-yu/StableBranchWithTestcases

Fix AST nodes to code issues (MAGN-836, MAGN-839)