update hardware_test
merge conflict