Added braces
Removed xml from post header and testrefactoring
Extracted userinfo matcher to static function
Improved test quality for siteinfo based tests