Rename commands
Add tests
Fix initial wrap error