Be even more strict about testing.