Fixing blackbox tests that target d.o.