Updated views, urls and tests to include the 12 required templates. Revised part of the story in the functional test.
