Fixed predefined templates
Fixed another test