Minor modifications in the tests code