Restructured test output