fix tests
...
closed #1318
fix test data
closed #1317
closed #1316
fix translations
Update from Parent