Tests are in right folders up to PSR-0