Adjust to recent unittest changes