Improvements to AudioSink and AudioTestSource