Restructured test-programs.
restructured test programs