Fixed: bug in backtracking over function parameters
Fixed error in handling escaped names
Fixed failing test
Refactored composite tests into separate tests
Misc changes