Bug fix for translation service plus improved Selenium test

Change-Id: I0156d81e02712bf45cde05c0f1dc8dadefc2e8c5