Improve the tests