Improvements the tests