KFSCNTRB-1681 fixing tests