Tests were failing because of changes in the strings keys. Fixed this.
This will create a new commit in order to revert the existing changes.
