move to PSR4 and adjust phpunit 0 tests