Fixing tests; translations