Fixed tests broken in 2ee21d9.