Little refactory
Added coverage to tests
Ignored coverage dir
Added some more templtes