Fixed tests broken by ca2658d143ad76da71b8c2ade8932e16f583b1f4