PHPUnit is testing a file, not a dir
Added fixes for more class errors