Small refactoring.
Ignore test due to xqj driver issues with loading lang_en.txt.