Changed the structure of the tests.