Fix some weak tests