Remove duplicated version of 'delay'
Re-enable drain test
Merge branch 'coverage' into jack_support
Jack output: add support for stream draining