Added more tests, fixed Talk bugs, and minor cleaning