Merge changes Ia9abb3d5,Ifea70abe

* changes:
  test delete in provider manager
  test delete in provider manager