Task/test and fixes

Have you spoken with Marcos about this particular subject? He told me specifically to maintain the Telefonica copyright here.