- Rename variables
- Fixed unicode test