Qual: Clean a lot of deprecated code
Fix: bad phpunit test case