Fix unnecessary hyphens
Add tests