Fixed random broken tests