Add titles, helper and tests