Refactor tests
Refactor template tag and filte
Merge branch 'feature/refactors' into develop