PHPUnit tests back in.

Please don't let it be the PHPUnit tests that were mucking things up...