re #9671 re-enable disabled tests