test on hardware and fix