Build #872:   Fix broken tests. on branch develop almost 12 years ago