Some last changes made and fist test done.
Pending to fix things.