Unbreak bundler tests
Unbreak cli-test.sh