LPS-33680

Hey Victor,

sorry for the late but it took more time I expected first. I rewrote the test to simplify and generalize it a bit, but I kept the original main logic. I also changed the import logic because it was possible to avoid the new finder so finally I was able to remove it. Please test the code (I also did it) to make sure it works well, if so, please send it to Julio.

If you have any question just let me know!

Daniel