Improve tests, get them to fail