Merge "Improve test_baremetal_basic_ops"