Fixed random broken tests, not all are fixed though