Rename options
Add tests