tweaks ;)
add test for template preservation/deletion