Fix Tests for 6.0.0 [RTFACT-16765]