Fix broken tests (that were masking the problem fixed by the previous checkin)