remove unnecessary dependency, add test
update branch aliases
fix template manager not being a singleton