Updated unit tests to use new  ongr/testing-bundle, includes strict psr2 fixes