Test wrapping of single channel ops
Port ops to new wrapper code
Merge branch 'refs/heads/thread-refactor'