ticket:1 template fix. test fix