Restructuring Templates
Optimized error handling for html template tests
Fix for invalid method call in EditorView