Merge "Improve audio encoder tests"