recover the lost conductor.js changes, fix tests