Restructuring of the tests