Update some tests for latest changes.