SimpleTemplate fixes
unit test fix