Changes to run the tests Locally and Remotelly