[dist] now using external modules, where tests still pass