Fixed remaining broken tests