Merge "[ui] refactor test type triggers"