BS-9367: fix test inheritance issue