Add ScopeTreeTest
Add rewriters for normalizing WITH and RETURN