Refactored tests and removed htmltags lib(comments for more info)