Updated Doctrine In The Framework Tests

Replaces #3375. I still get `100%` passing tests as show by the diff.