Fixed remaining tests