Minor changes and fixes in order to run the tests