Avoid deleting providers tests to not mess the other tests
Fix snapshot tests to not 'splode
Merge pull request #1059 from mfalesni/avoid-deleting-providers-bz

Avoid deleting providers tests to not mess the other tests
Merge pull request #1057 from psav/fix_snapshot

Fix snapshot tests to not 'splode