Updates to talk; more test cases