Fixed templates in test. Modularised views with associated controllers.