Stop on first error
Update the tests