Added templates to manifest.
Fix test for Dj1.5