refactoring variables in pckge Test, and refactoring some other classes in other pkges