Improve test.py