Fixes for translation related test fails
[Safe Refactor] Add some unit tests.
Resolve merge conflicts with akbars code