Fixing a couple of more broken tests