KOD-353 update for failing non related tests