Some modifications in the tests