fixed all breaking specs after adding templates