Restructuring universal test