Added TalkType and TalkCategory plus some minor updated to the test env