Merge "Slightly improve debug output from test"