Marc, I think you do not need this part ...? Lines 122 to 133
Tests for correct displayal of language variables have been added. B3P-337
B3P-219