variable name consistency in the test code
merge