Removing unsupported class names
Improving attribute detection
Updating markup test