Update tests for stricter APIs.