Tweaked the test suite

The same as my previous pull, only without the composer updates, so everything should pass.