Update the test name and refine tests