Added tests. Issue: #370
Removed unused templates. Issue: #370