Use decorators
Add test file