Moved templates to configuration. Added draft tests that were commented. Fixed PEP8 issues.