Improve the register name and the test shell