Merge "Fix race condition in CARSM unit tests"