Add dynamic titles and tests