Improvements at the tests