Tidy and improve models and utils tests
Tidy up the forms tests
Tidy and improve views tests