use new tests, update #1976