Update tests from latest changes.