Fix formatting for xpath step expressions.
Move test data to correct package.
Fix edge case for folding.
Fix indentation for function body started with comment.