Add respective unit tests for comments