Fix not highlighting class attribute issue
Fix similar issues and those test