Added basic Comments handling and more unit tests