refactor tests in other package