20678 - fixes (some temporary) for failing tests