Include test classes to prove framework is reliable, started refactoring templates.