remove template
Revert "remove dead code"

This reverts commit 7355be0c4f8d10a7981a86bad3a7d1c7043f726c.
remove obsolete test
fix diappearing headline