Bugfixes / test fixes (fixing ci)

@jlipps could you review, in particular adb.js, had do do more than expected to fix the ci tests.