Reconfigure html tags to improve test coverage
Change div calls from id to class