Misc. adjustments for test UI.