Doing some organization of Test structure