Increase test coverage

@LukasReschke mind reviewing? ^_^
well - unit tests for templates would be great - right? :speak_no_evil: