moving template in sub-folder
Moved query Tester in tests
Passing Persistent factory on template
Merge remote-tracking branch 'refs/remotes/origin/master'