Merge fixup
Tests for AudioView and Queue.