Rename package and refactor unit test