Fixing a few broken tests