rename some test and remove redundance test