More static pages, and tests