Merge "Fix anteater issues of baro_tests"