fix tests breaking in some cases
v1.970

   * fix tests breaking in some case