Fix test and and make test pass for all ElementType tokens
Remove unused function