Added support for activity comments and added some units unit tests