Change class name
modify unit test