Merge "Make tests output more concise and clearer"