TB 3 RC2 - update class names in expectations