TST summary refactor