Fixed more tests (some(?) of which require changes in the spanish branch)