[FIX] GH-658: Evaluate XQUnit tests in the correct scope.
[MOD] Static functions aren't expressions.
Merge pull request #667 from LeoWoerteler/gh-658

Static Function Refactorings