refactor the test*.py