Better structuring the tests