Improvements in the tests