Better temp files creation/deletion in tests
Added Bundles