Remove decorator
Remove Time class to base.py
Add test fixtures