diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index c46fdd0f31..d093642c1b 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -3768,6 +3768,8 @@ function XmlExtendedFields($function, $array)
 		$mes = e107::getMessage();
 		$this->setUe();
 
+		$ret = array();
+
 		foreach ($array['field'] as $efield)
 		{
 			$attrib = $efield['@attributes'];
@@ -3780,8 +3782,14 @@ function XmlExtendedFields($function, $array)
 			$source = 'plugin_'.$this->plugFolder;
 			$remove = (varset($attrib['deprecate']) == 'true') ? TRUE : FALSE;
 
-			if(!isset($attrib['system'])) $attrib['system'] = true; // default true
-			else $attrib['system'] = $attrib['system'] === 'true' ? true : false;
+			if(!isset($attrib['system']))
+			{
+				 $attrib['system'] = true; // default true
+			}
+			else
+			{
+				$attrib['system'] = ($attrib['system'] === 'true') ? true : false;
+			}
 
 			switch ($function)
 			{
@@ -3816,9 +3824,18 @@ function XmlExtendedFields($function, $array)
 						$mes->add(EPL_ADLAN_251 .$name, E_MESSAGE_SUCCESS);
 					}
 					break;
+
+				case 'test': // phpunit
+					$ret[] = array('name' => $name, 'attrib' => $attrib, 'source' => $source);
+				break;
 			}
 		}
 
+		if(!empty($ret))
+		{
+			return $ret;
+		}
+
 		return null;
 	}