Implemented latest changes by @ilvalle
Avoid to run other modules tests