Improve for the tests