added new tests and added html tags