do some clean work, remove useless variable empty line, combine the test package