BISERVER-10435: Fixed tests broken by yesterdays checkin.