Test enhancements
Merge branch 'master' into pipelined