restructuring a tests