Fixed local context vars when including.
Improved tests.
Fixed local identifiers. Test OK.