Improvements in the testing project and in the tests