Update tests to look at error
Tidy up validator erros