improved tests and translations
improved tests