Updated B2, F*, G*, I2 ahd J* tests