Use modal for including talk in a list.
Fixed tests.