Fixed a couple more broken tests.