Merge "Fixing Car Audio tests"