MBS-3663: fix tests