Rename tag to element
Add test