Changed the structure of the test