npm/810-fix-failing-tests