Adding test coverage, refactoring log class
Adding some testing tools
Fixing some issues, adding new things to template
Merge branch 'master' into github