Hotfix/zend test usage xpath

Fix usage of xpath and other little fix