Merge branch 'zecke/fixes/mgcp-transociding-tests'

Various clean-ups and extensions to the tests. Share one test
set-up routine, capture more of the API inside the output files.