Tweaking broken tests