Fix the code (and simplify it) to run also on language other then English.
Fix NRE in the tests