Improve structure of the tests.