Restructure output from tests.