otec: test fixes
fix conflict
bus integration -- somewhat working.