Use PHPUnit's DOM Comperator rather than string matching
Fix ParamParser to handle param definition without variable name properly
Fix Test