Changes on templates after test