Some updates to tests, corresponding to recent API changes.