Since pkg_critpath is no longer required, adjust tests as such