Refactoring package name + testing lookup