Update a few tests. #1558