Added more tests and fix scenario of HTML with comments