Fix a couple of broken tests