Update BIT #1962 to remove created test trust data upon completion