Minor changes to output tests