Changed the tests structure