Cherry pick from de6124e350: Manual tweaks to display of tests