Build #98:   Fix broken tests on branch fix-min-fresh over 7 years ago