Restructuring tests