Created tests and fixed templates