Fix test and rename for hardware too