updated tests, update #2869