Change name
Add tests