A few modifications with the tests