More PHPUnit tests...