ticket:1 rm models.py and tests.py