Add more (breaking) checks to unit test