Fix a couple more broken tests