Fixing more weak tests