Updated PHPUnit tests so they can be run as a suite.