*Updated templates
*added addtional tests