Minor changes to organize output for testing.