SNG-1125: Updates tests