Get tests working with new CSS and markup

- Update the selectors used in the tests
- Fill in some bits that were missing after rewriting the views
- Standardises on p9q9 for naming the fields, no more underscores