Minor fixes

- Minor fixes to naming
- Additional tests for translation