Prepare indentation of partial
Change root variable name
Support lambda variable
Rewrite tests