Unit-tests from 1.3.3, update phpunit.xml testsuite to passed tests