Fix code coverage after PSR-0 refactoring