Changes to PHPUnit Tests

A few more coming down the pipeline.