ticket:8 edited test and template