Fixed demo and test app to use new I18NKey