Get rid of comments test cases (move to another feature branch)