First changes for migration to PHPUnit