wip. better but now there are run-away issues in ext-tests: