Fix tests

Composer was pulling down the latest (v2.7) of unspecified components.  This was causing mocks to fail since the API between different components wasn't matching up.
Same thing. It's related to the ICU dependency problems introduced in 2.4 no doubt.  This is why all of that was re-worked in 2.5.x.